Mark all patches as applied upstream for 2017.11

diff --git a/debian/changelog b/debian/changelog
index 5f43c31e7536241258c42f9d63bc6222272cd6cd..9d7d6c212015cc60073c737a86b2b42fb6ca867b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ostree (2017.10-2) UNRELEASED; urgency=medium
+
+  * Mark all patches as applied upstream for 2017.11
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 30 Aug 2017 10:09:26 +0100
+
 ostree (2017.10-1) unstable; urgency=medium
 
   * New upstream release

diff --git a/debian/patches/Remove-shebang-from-bash-completions.patch b/debian/patches/Remove-shebang-from-bash-completions.patch
index e1c397506c2f3c5b1041f41fa7f3474c9531702a..2ff5e0adbd094ef0f85ba96be554aa46e856f414 100644 (file)
--- a/debian/patches/Remove-shebang-from-bash-completions.patch
+++ b/debian/patches/Remove-shebang-from-bash-completions.patch
@@ -6,6 +6,8 @@ bash completions are to be sourced. It makes little sense to
 execute them.
 
 Signed-off-by: Simon McVittie <smcv@debian.org>
+Forwarded: https://github.com/ostreedev/ostree/pull/1119
+Applied-upstream: 2017.11, commit:355e8516b04801caf50b0b8a218fc8f6321d8d05
 ---
  bash/ostree | 2 --
  1 file changed, 2 deletions(-)

diff --git a/debian/patches/basic-test-Skip-explicit-uses-of-bare-user-if-no-user-xat.patch b/debian/patches/basic-test-Skip-explicit-uses-of-bare-user-if-no-user-xat.patch
index 01a11e368c11f90e12ab3f3770dbe71a8e41e263..7a826f8169568dfd13380bdc0962be2454e7d03d 100644 (file)
--- a/debian/patches/basic-test-Skip-explicit-uses-of-bare-user-if-no-user-xat.patch
+++ b/debian/patches/basic-test-Skip-explicit-uses-of-bare-user-if-no-user-xat.patch
@@ -3,6 +3,8 @@ Date: Tue, 29 Aug 2017 17:02:43 +0100
 Subject: basic-test: Skip explicit uses of bare-user if no user xattrs
 
 Signed-off-by: Simon McVittie <smcv@debian.org>
+Forwarded: https://github.com/ostreedev/ostree/pull/1120
+Applied-upstream: 2017.11, commit:41e6871e514dda1392354f642edb3484cf79af47
 ---
  tests/basic-test.sh | 138 +++++++++++++++++++++++++++++-----------------------
  1 file changed, 77 insertions(+), 61 deletions(-)

diff --git a/debian/patches/libtest-Allow-skipping-single-checks-without-user-xattrs.patch b/debian/patches/libtest-Allow-skipping-single-checks-without-user-xattrs.patch
index fa59fe633c44db3150269a4a18564bb6b2ff5f33..5f9ef75d052395118ead42542b107321945455ee 100644 (file)
--- a/debian/patches/libtest-Allow-skipping-single-checks-without-user-xattrs.patch
+++ b/debian/patches/libtest-Allow-skipping-single-checks-without-user-xattrs.patch
@@ -3,6 +3,8 @@ Date: Tue, 29 Aug 2017 17:02:18 +0100
 Subject: libtest: Allow skipping single checks without user xattrs
 
 Signed-off-by: Simon McVittie <smcv@debian.org>
+Forwarded: https://github.com/ostreedev/ostree/pull/1120
+Applied-upstream: 2017.11, commit:a7686a0c400524afeb3fad14e04c65105eaf7cdf
 ---
  tests/libtest.sh | 11 +++++++++++
  1 file changed, 11 insertions(+)

diff --git a/debian/patches/test-basic-user-only-Skip-final-step-if-no-user-xattrs.patch b/debian/patches/test-basic-user-only-Skip-final-step-if-no-user-xattrs.patch
index 61a9431598afa540e4d5989c524d7beb4d67f575..3c537528c8a878cc7d33ce51d60f384646ce03ad 100644 (file)
--- a/debian/patches/test-basic-user-only-Skip-final-step-if-no-user-xattrs.patch
+++ b/debian/patches/test-basic-user-only-Skip-final-step-if-no-user-xattrs.patch
@@ -8,6 +8,8 @@ need to skip this last stage, which explicitly uses a bare-user
 repository.
 
 Signed-off-by: Simon McVittie <smcv@debian.org>
+Forwarded: https://github.com/ostreedev/ostree/pull/1120
+Applied-upstream: 2017.11, commit:3fcd81df86b66c5abb61118d2ef3822304cb5da3
 ---
  tests/test-basic-user-only.sh | 36 +++++++++++++++++++-----------------
  1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/debian/patches/test-libarchive-import-Skip-if-extended-attributes-are-un.patch b/debian/patches/test-libarchive-import-Skip-if-extended-attributes-are-un.patch
index bb340814ed23a03dad24bc3170235dc9be7247f1..2de0834322c729b16fd27964122a34f45553d64d 100644 (file)
--- a/debian/patches/test-libarchive-import-Skip-if-extended-attributes-are-un.patch
+++ b/debian/patches/test-libarchive-import-Skip-if-extended-attributes-are-un.patch
@@ -5,6 +5,8 @@ Subject: test-libarchive-import: Skip if extended attributes are unsupported
 This is the case at build-time on some (all?) Debian autobuilders.
 
 Signed-off-by: Simon McVittie <smcv@collabora.com>
+Forwarded: https://github.com/ostreedev/ostree/pull/1120
+Applied-upstream: 2017.11, commit:760ff2f66ec5058b0ddf82fc7dbdd9ffbae44c6b
 ---
  tests/test-libarchive-import.c | 57 +++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/debian/patches/test-pull-bareuser.sh-This-test-uses-bare-user-hence-need.patch b/debian/patches/test-pull-bareuser.sh-This-test-uses-bare-user-hence-need.patch
index 8a19bf49c8d1acbe9fb46a7cd456eeb844f74519..4be051ea454a11363505e6b20568122c92db0991 100644 (file)
--- a/debian/patches/test-pull-bareuser.sh-This-test-uses-bare-user-hence-need.patch
+++ b/debian/patches/test-pull-bareuser.sh-This-test-uses-bare-user-hence-need.patch
@@ -3,6 +3,8 @@ Date: Tue, 29 Aug 2017 17:01:41 +0100
 Subject: test-pull-bareuser.sh: This test uses bare-user, hence needs xattrs
 
 Signed-off-by: Simon McVittie <smcv@debian.org>
+Forwarded: https://github.com/ostreedev/ostree/pull/1120
+Applied-upstream: 2017.11, commit:1d755977c89c9bd360c61e988b9d445d1d5a4d43
 ---
  tests/test-pull-bareuser.sh | 1 +
  1 file changed, 1 insertion(+)